Normalize .. and . in diagnostic file paths#155569
Open
arferreira wants to merge 1 commit intorust-lang:mainfrom
Open
Normalize .. and . in diagnostic file paths#155569arferreira wants to merge 1 commit intorust-lang:mainfrom
arferreira wants to merge 1 commit intorust-lang:mainfrom
Conversation
Collaborator
|
Some changes occurred in src/tools/compiletest cc @jieyouxu |
rustbot
added
A-compiletest
This comment has been minimized.
This comment has been minimized.
arferreira
force-pushed
the
normalize-diagnostic-paths
branch
from
72beb68 to
e02a2f9
Compare
Urgau
reviewed
Apr 20, 2026
arferreira
force-pushed
the
normalize-diagnostic-paths
branch
from
e02a2f9 to
7e7055d
Compare
arferreira
force-pushed
the
normalize-diagnostic-paths
branch
from
7e7055d to
b0cb45e
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #51349
Lexically normalize
.and..in file paths when rendering diagnostics, so errors showfoo.rsinstead ofsub/../foo.rs. Normalization is scoped to the newFileNameDisplayPreference::Diagnosticsvariant used bySourceMap::filename_for_diagnostics;file!(), debuginfo, and remapped/local/short paths are unchanged.Uses the unstable
Path::normalize_lexically,canonicalizeis avoided because it turns relative paths absolute, which broke the previous attempt in #83345. Paths thatnormalize_lexicallyrejects (leading escapes, net-negative..) fall back to the raw path and don't occur in practice for the diagnostic paths this PR targets. Compiletest gains a$DIR/..substitution so existing.stderrfiles that referenced auxiliary paths above$DIRkeep matching.Previous attempt was #68654.
r? @estebank